Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:34:44 +0000 (09:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:34:44 +0000 (09:34 -0700)
commit7b34e032de5d2b81130d91ee7805507458e4cb74
treedcbeeb03d3105743f9cd35f82ddb08ff11d877f5
parent7da17bab91730a85a6ab1abbe36b82c9b549d502
parent8a2084b69bc6bc44737ed70ba6fb9d0d1bb3dcf7
Merge from trunk.